Protect against XKB being stupid. Reported by Pedro Villavicencio.

        * gdk/x11/gdkkeys-x11.c (_gdk_keymap_key_is_modifier): Protect
        against XKB being stupid. Reported by Pedro Villavicencio.

svn path=/trunk/; revision=20413

diff --git a/ChangeLog b/ChangeLog
index 8fe627aa91e8d9849af39336e21153969f39f8bf..41b0bd5beb9aff1bec0bd38294407e94c8740ab0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-16  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 508751 – gnome-terminal crashed with SIGSEGV after keypress
+
+       * gdk/x11/gdkkeys-x11.c (_gdk_keymap_key_is_modifier): Protect
+       against XKB being stupid. Reported by Pedro Villavicencio.
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkplug.c (_gtk_plug_send_delete_event): use g_object_ref()

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 6d654e5bf477cd5c63b00c86858d80e16f422a1d..ee50eea1f33e5bd6c30e6d15f357cc79e11598a0 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1661,7 +1661,7 @@ _gdk_keymap_key_is_modifier (GdkKeymap *keymap,
     {
       XkbDescRec *xkb = get_xkb (keymap_x11);
       
-      if (xkb->map->modmap[keycode] != 0)
+      if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
        return TRUE;
     }
   else